fix: CI/CD Bot exit early before applying plan on unmergeable PR #5590
+24
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
eakmanrq
reviewed
Dec 2, 2025
Comment on lines
777
to
780
| raise CICDBotError( | ||
| "Merge commit cannot be cleanly created. Likely missing CODEOWNERS approval. " | ||
| "Please check PR and resolve any issues." | ||
| ) |
Contributor
There was a problem hiding this comment.
Two things:
- The merge commit itself can be created so I don't think the first sentence is needed.
- CODEOWNERS approval is one way a PR can be blocked. Can you generalize this and say that a branch protection/ruleset requirement is likely not satisfied?
Author
There was a problem hiding this comment.
Good catch, fixed! Will check back in morning and make sure all ci/cd passed
…issing CODEOWNERS approval, this is breaking synchronous deployments.
bcrant
force-pushed
the
bcrant/cicd-exit-before-deploy
branch
from
9688d27 to
2665c71
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
On final step of CI/CD, applying plan to prod, exit early (raise an error) before applying plan to prod if the PR merge state status is "blocked".
Why?
It is currently possible for synchronized deployments to get into a bad state, where the changes in a PR have been applied to the production environment but have not been merged (desychronized), with the following configurations:
This is currently possible because the
GithubController.deploy_to_prod()checks explicitly checks for "is_dirty" state, but if the only thing missing is CODEOWNER approval, the merge state status "is_blocked", not "is_dirty".https://docs.github.com/en/enterprise-cloud@latest/graphql/reference/enums#mergestatestatus